From: Keir Fraser <keir@xen.org>
Date: Wed, 6 Oct 2010 10:00:19 +0000 (+0100)
Subject: x86 hvm: Factor out hvm_map_guest_frame_{rw,ro} from hvm_map_entry
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11414
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=b5d197b17dae4f942782de2cda2fc3b072687d97;p=xen.git

x86 hvm: Factor out hvm_map_guest_frame_{rw,ro} from hvm_map_entry

This allows us to map pages from guest physical addresses.

This will be used with nested virtualization.

Signed-off-by: Uwe Dannowski <Uwe.Dannowski@amd.com>
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Signed-off-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 7cca08a6e9..94190d3079 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -1356,55 +1356,84 @@ int hvm_virtual_to_linear_addr(
     return 0;
 }
 
-static void *hvm_map_entry(unsigned long va)
+static void *__hvm_map_guest_frame(unsigned long gfn, bool_t writable)
 {
-    unsigned long gfn, mfn;
+    unsigned long mfn;
     p2m_type_t p2mt;
+    struct p2m_domain *p2m = p2m_get_hostp2m(current->domain);
+
+    mfn = mfn_x(writable
+                ? gfn_to_mfn_unshare(p2m, gfn, &p2mt, 0)
+                : gfn_to_mfn(p2m, gfn, &p2mt));
+    if ( (p2m_is_shared(p2mt) && writable) || !p2m_is_ram(p2mt) )
+        return NULL;
+    if ( p2m_is_paging(p2mt) )
+    {
+        p2m_mem_paging_populate(p2m, gfn);
+        return NULL;
+    }
+
+    ASSERT(mfn_valid(mfn));
+
+    if ( writable )
+        paging_mark_dirty(current->domain, mfn);
+
+    return map_domain_page(mfn);
+}
+
+void *hvm_map_guest_frame_rw(unsigned long gfn)
+{
+    return __hvm_map_guest_frame(gfn, 1);
+}
+
+void *hvm_map_guest_frame_ro(unsigned long gfn)
+{
+    return __hvm_map_guest_frame(gfn, 0);
+}
+
+void hvm_unmap_guest_frame(void *p)
+{
+    if ( p )
+        unmap_domain_page(p);
+}
+
+static void *hvm_map_entry(unsigned long va)
+{
+    unsigned long gfn;
     uint32_t pfec;
-    struct vcpu *v = current;
-    struct p2m_domain *p2m = p2m_get_hostp2m(v->domain);
+    char *v;
 
     if ( ((va & ~PAGE_MASK) + 8) > PAGE_SIZE )
     {
         gdprintk(XENLOG_ERR, "Descriptor table entry "
                  "straddles page boundary\n");
-        domain_crash(current->domain);
-        return NULL;
+        goto fail;
     }
 
-    /* We're mapping on behalf of the segment-load logic, which might
-     * write the accessed flags in the descriptors (in 32-bit mode), but
-     * we still treat it as a kernel-mode read (i.e. no access checks). */
+    /*
+     * We're mapping on behalf of the segment-load logic, which might write
+     * the accessed flags in the descriptors (in 32-bit mode), but we still
+     * treat it as a kernel-mode read (i.e. no access checks).
+     */
     pfec = PFEC_page_present;
     gfn = paging_gva_to_gfn(current, va, &pfec);
-    if ( pfec == PFEC_page_paged || pfec == PFEC_page_shared )
-        return NULL;
-    mfn = mfn_x(gfn_to_mfn_unshare(p2m, gfn, &p2mt, 0));
-    if ( p2m_is_paging(p2mt) )
-    {
-        p2m_mem_paging_populate(p2m, gfn);
-        return NULL;
-    }
-    if ( p2m_is_shared(p2mt) )
-        return NULL;
-    if ( !p2m_is_ram(p2mt) )
-    {
-        gdprintk(XENLOG_ERR, "Failed to look up descriptor table entry\n");
-        domain_crash(current->domain);
-        return NULL;
-    }
+    if ( (pfec == PFEC_page_paged) || (pfec == PFEC_page_shared) )
+        goto fail;
 
-    ASSERT(mfn_valid(mfn));
+    v = hvm_map_guest_frame_rw(gfn);
+    if ( v == NULL )
+        goto fail;
 
-    paging_mark_dirty(current->domain, mfn);
+    return v + (va & ~PAGE_MASK);
 
-    return (char *)map_domain_page(mfn) + (va & ~PAGE_MASK);
+ fail:
+    domain_crash(current->domain);
+    return NULL;
 }
 
 static void hvm_unmap_entry(void *p)
 {
-    if ( p )
-        unmap_domain_page(p);
+    hvm_unmap_guest_frame(p);
 }
 
 static int hvm_load_segment_selector(
diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h
index ebdd859324..6a98e51a3b 100644
--- a/xen/include/asm-x86/hvm/hvm.h
+++ b/xen/include/asm-x86/hvm/hvm.h
@@ -344,6 +344,10 @@ int hvm_virtual_to_linear_addr(
     unsigned int addr_size,
     unsigned long *linear_addr);
 
+void *hvm_map_guest_frame_rw(unsigned long gfn);
+void *hvm_map_guest_frame_ro(unsigned long gfn);
+void hvm_unmap_guest_frame(void *p);
+
 static inline void hvm_set_info_guest(struct vcpu *v)
 {
     if ( hvm_funcs.set_info_guest )